From 81946a73dc975a7dafe9017a8e61d1e64fdbedbf Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 3 Oct 2018 14:11:20 +0100 Subject: [PATCH] tools/ocaml: Delete the Xenctrl.with_intf wrapper This wrapper hides an opening and closing of the xenctrl handle, which amongst other things opens and closes multiple device files. A process should create one handle at the start of day and reuse that; indeed there is no guarentee that the process will retain sufficient permissions to re-open /dev/xen/privcmd at a later point. With the final user of Xenctrl.with_intf removed, drop the wrapper entirely. Signed-off-by: Andrew Cooper Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl.ml | 6 ------ tools/ocaml/libs/xc/xenctrl.mli | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 40fbd3790f..955dd92546 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -141,12 +141,6 @@ type handle external interface_open: unit -> handle = "stub_xc_interface_open" external interface_close: handle -> unit = "stub_xc_interface_close" -let with_intf f = - let xc = interface_open () in - let r = try f xc with exn -> interface_close xc; raise exn in - interface_close xc; - r - external domain_create: handle -> domctl_create_config -> domid = "stub_xc_domain_create" diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 906ce9486b..eeed24fa96 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -108,7 +108,7 @@ exception Error of string type handle external interface_open : unit -> handle = "stub_xc_interface_open" external interface_close : handle -> unit = "stub_xc_interface_close" -val with_intf : (handle -> 'a) -> 'a + external domain_create : handle -> domctl_create_config -> domid = "stub_xc_domain_create" external domain_sethandle : handle -> domid -> string -> unit = "stub_xc_domain_sethandle" -- 2.30.2